Looks like someone merged and moved the pincpu operation to after the

memory reservation and didn't read the comments I left in the code:

# repin domain vcpus if a restricted cpus list is provided
# this is done prior to memory allocation to aide in memory
# distribution for NUMA systems.

This patch moves the pincpu op back to where it was.

Signed-off-by: Ryan Harper <ryanh@us.ibm.com>

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 074d8812c293a35efccb1cd31094fb15446e3798..250bd12494d1a233e1ab833df008fc8728ff930f 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -1171,11 +1171,6 @@ class XendDomainInfo:
 
             xc.domain_setcpuweight(self.domid, self.info['cpu_weight'])
 
-            m = self.image.getDomainMemory(self.info['memory'] * 1024)
-            balloon.free(m)
-            xc.domain_setmaxmem(self.domid, m)
-            xc.domain_memory_increase_reservation(self.domid, m, 0, 0)
-
             # repin domain vcpus if a restricted cpus list is provided
             # this is done prior to memory allocation to aide in memory
             # distribution for NUMA systems.
@@ -1186,6 +1181,11 @@ class XendDomainInfo:
                     cpu = [ int( cpus[v % len(cpus)] ) ]
                     xc.domain_pincpu(self.domid, v, cpu)
 
+            m = self.image.getDomainMemory(self.info['memory'] * 1024)
+            balloon.free(m)
+            xc.domain_setmaxmem(self.domid, m)
+            xc.domain_memory_increase_reservation(self.domid, m, 0, 0)
+
             self.createChannels()
 
             channel_details = self.image.createImage()